wayland: Check for subsurface looking up the toplevel

gdk_window_get_toplevel() walks up the windows tree looking for the
corresponding toplevel window, but needs to account for subsurfaces as
well on Wayland.

https://bugzilla.gnome.org/show_bug.cgi?id=775319

diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
index 4051d8dff41cd6bd3ac31274eef2b0e7a1be3aa3..2ff89ee8e66eeaa1a84e0b02fa88cd9eb93188cb 100644 (file)
--- a/gdk/gdkwindow.c
+++ b/gdk/gdkwindow.c
@@ -2278,7 +2278,8 @@ gdk_window_get_toplevel (GdkWindow *window)
 {
   g_return_val_if_fail (GDK_IS_WINDOW (window), NULL);
 
-  while (window->window_type == GDK_WINDOW_CHILD)
+  while (window->window_type == GDK_WINDOW_CHILD ||
+         window->window_type == GDK_WINDOW_SUBSURFACE)
     {
       if (gdk_window_is_toplevel (window))
        break;